diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 17aacd0..d43ea88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -26,6 +27,7 @@ import java.io.IOException; import java.util.List; import java.util.Objects; +import java.util.Set; /** * @Description: 业务管理-设备收发管理 @@ -102,13 +104,20 @@ @ApiOperation("标签绑定") @PostMapping("/label/bind") - public ReturnDTO> bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { + public ReturnDTO bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { Assert.isFalse(ObjectUtils.isEmpty(labelBindDTO.getLabel()), () -> { throw new BusinessException(BusinessExceptionEnum.LABEL_IS_EMPTY); }); return dispatchService.bindLabel(labelBindDTO); } + + @ApiOperation("根据标签查询设备列表") + @PostMapping("/label/readList") + public ReturnDTO> readList(@RequestBody @Valid Set strSet) { + return dispatchService.equipmentLabelReadList(strSet); + } + @ApiOperation("催办") @PostMapping("/remindWorker") public ReturnDTO remindWorker(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 17aacd0..d43ea88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -26,6 +27,7 @@ import java.io.IOException; import java.util.List; import java.util.Objects; +import java.util.Set; /** * @Description: 业务管理-设备收发管理 @@ -102,13 +104,20 @@ @ApiOperation("标签绑定") @PostMapping("/label/bind") - public ReturnDTO> bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { + public ReturnDTO bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { Assert.isFalse(ObjectUtils.isEmpty(labelBindDTO.getLabel()), () -> { throw new BusinessException(BusinessExceptionEnum.LABEL_IS_EMPTY); }); return dispatchService.bindLabel(labelBindDTO); } + + @ApiOperation("根据标签查询设备列表") + @PostMapping("/label/readList") + public ReturnDTO> readList(@RequestBody @Valid Set strSet) { + return dispatchService.equipmentLabelReadList(strSet); + } + @ApiOperation("催办") @PostMapping("/remindWorker") public ReturnDTO remindWorker(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 8486dad..76b7b7a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -25,6 +25,7 @@ import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import com.casic.missiles.model.business.BusinessLabExecutiveInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.resource.BizResourceStaffInfo; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; @@ -38,10 +39,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; import static com.casic.missiles.enums.business.MeasureTypeEnum.INSIDE_MEASURE; import static com.casic.missiles.enums.sample.CurrentSegmentEnum.*; @@ -160,6 +158,17 @@ } @Override + public ReturnDTO> equipmentLabelReadList(Set strSet) { + if (CollectionUtils.isEmpty(strSet)) { + return ReturnUtil.success(); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.and(QueryWrapper -> QueryWrapper.in("rfid", strSet)); + List resultList = eqptEquipmentInfoMapper.selectList(queryWrapper); + return ReturnUtil.success(resultList); + } + + @Override public ReturnDTO remindWorker(DeviceStatusChangeDTO deviceReceiveDTO) { BusinessLabExecutiveInfo labExecutiveInfo = getLabExecutiveInfo(deviceReceiveDTO); if (labExecutiveInfo != null) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 17aacd0..d43ea88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -26,6 +27,7 @@ import java.io.IOException; import java.util.List; import java.util.Objects; +import java.util.Set; /** * @Description: 业务管理-设备收发管理 @@ -102,13 +104,20 @@ @ApiOperation("标签绑定") @PostMapping("/label/bind") - public ReturnDTO> bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { + public ReturnDTO bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { Assert.isFalse(ObjectUtils.isEmpty(labelBindDTO.getLabel()), () -> { throw new BusinessException(BusinessExceptionEnum.LABEL_IS_EMPTY); }); return dispatchService.bindLabel(labelBindDTO); } + + @ApiOperation("根据标签查询设备列表") + @PostMapping("/label/readList") + public ReturnDTO> readList(@RequestBody @Valid Set strSet) { + return dispatchService.equipmentLabelReadList(strSet); + } + @ApiOperation("催办") @PostMapping("/remindWorker") public ReturnDTO remindWorker(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 8486dad..76b7b7a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -25,6 +25,7 @@ import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import com.casic.missiles.model.business.BusinessLabExecutiveInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.resource.BizResourceStaffInfo; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; @@ -38,10 +39,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; import static com.casic.missiles.enums.business.MeasureTypeEnum.INSIDE_MEASURE; import static com.casic.missiles.enums.sample.CurrentSegmentEnum.*; @@ -160,6 +158,17 @@ } @Override + public ReturnDTO> equipmentLabelReadList(Set strSet) { + if (CollectionUtils.isEmpty(strSet)) { + return ReturnUtil.success(); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.and(QueryWrapper -> QueryWrapper.in("rfid", strSet)); + List resultList = eqptEquipmentInfoMapper.selectList(queryWrapper); + return ReturnUtil.success(resultList); + } + + @Override public ReturnDTO remindWorker(DeviceStatusChangeDTO deviceReceiveDTO) { BusinessLabExecutiveInfo labExecutiveInfo = getLabExecutiveInfo(deviceReceiveDTO); if (labExecutiveInfo != null) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index bd76a53..2118a6e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -232,11 +232,11 @@ String equipmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.EQUIPMENT_PREFIX, maxNo); equipmentInfoApproval.setEquipmentNo(equipmentNo); } - if(Objects.nonNull(equipmentInfoApproval.getDeptId())){ + if (Objects.nonNull(equipmentInfoApproval.getDeptId())) { Dept dept = deptMapper.selectById(equipmentInfoApproval.getDeptId()); equipmentInfoApproval.setDeptName(dept.getSimpleName()); } - if(Objects.nonNull(equipmentInfoApproval.getDirectorId())){ + if (Objects.nonNull(equipmentInfoApproval.getDirectorId())) { BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(equipmentInfoApproval.getDirectorId()); equipmentInfoApproval.setDirectorName(staffInfo.getStaffName()); } @@ -285,19 +285,19 @@ //给前端返回equipmentId用于提交后查询详情 Long equipmentId = equipmentInfoApprovalMapper.selectEquipmentIdById(request.getId()); //判断编辑审批类型是否有基本信息变化，从而删除草稿箱中该数据，因为非基本信息不需要走审批 - if(ApprovalTypeEnum.UPDATE == request.getApprovalType() && 1 == request.getChangeFlag()){ + if (ApprovalTypeEnum.UPDATE == request.getApprovalType() && 1 == request.getChangeFlag()) { return noBaseChangeHandle(request, equipmentId); } //判断是否登录及是否存在审批流程 BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval(); AuthUser user = ShiroKit.getUser(); - if(ApprovalTypeEnum.DELETE == request.getApprovalType() || ApprovalTypeEnum.UPDATE == request.getApprovalType()) { + if (ApprovalTypeEnum.DELETE == request.getApprovalType() || ApprovalTypeEnum.UPDATE == request.getApprovalType()) { Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); } //删除审批类型，先保存到审批表再提交 - if(ApprovalTypeEnum.DELETE == request.getApprovalType()){ + if (ApprovalTypeEnum.DELETE == request.getApprovalType()) { Long id = request.getId(); //设备主表id BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(id); equipmentInfoApproval = ConvertUtils.sourceToTarget(equipmentInfo, BizEquipmentInfoApproval.class); @@ -308,12 +308,12 @@ equipmentInfoApproval.setCreateUserId(user.getId()); equipmentInfoApproval.setCreateUserName(user.getName()); equipmentInfoApproval.setId(null); - if(equipmentInfoApprovalMapper.insert(equipmentInfoApproval) <= 0){ + if (equipmentInfoApprovalMapper.insert(equipmentInfoApproval) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } //切换为审批表id request.setId(equipmentInfoApproval.getId()); - }else{ + } else { equipmentInfoApproval.setId(request.getId()); } @@ -420,6 +420,10 @@ @Override public ReturnDTO> equipmentLabelReadList(Set strSet) { + //健壮性校验 + if (CollectionUtils.isEmpty(strSet)) { + return ReturnUtil.success(); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.and(QueryWrapper -> QueryWrapper.in("label", strSet)); List resultList = equipmentInfoMapper.selectList(queryWrapper); @@ -485,7 +489,7 @@ EquipmentApprovalListRequest listRequest = ConvertUtils.sourceToTarget(request, EquipmentApprovalListRequest.class); listRequest.setMeterStandardId(request.getStandardId()); Page equipmentInfoPage = equipmentInfoMapper.selectListPage(page, listRequest); - if(Objects.isNull(equipmentInfoPage) || CollectionUtils.isEmpty(equipmentInfoPage.getRecords())){ + if (Objects.isNull(equipmentInfoPage) || CollectionUtils.isEmpty(equipmentInfoPage.getRecords())) { return new Page<>(); } List standardEquipmentList = ConvertUtils.sourceToTarget(equipmentInfoPage.getRecords(), StandardEquipmentListResponse.class); @@ -496,7 +500,7 @@ List list = checkItemCategoryMapper.selectList(categoryWrapper); //如果标准装置仅有一个核查项分类，则自动补充核查项分类名称; //如果标准装置有多个核查项分类，展示为空，点击配置核查项时，再选择核查项分类进行具体内容配置 - if(!CollectionUtils.isEmpty(list) && list.size() == 1){ + if (!CollectionUtils.isEmpty(list) && list.size() == 1) { BizEquipmentStandardCheckItemCategory checkItemCategory = list.get(0); equip.setItemCategoryId(checkItemCategory.getId()); equip.setItemCategoryName(checkItemCategory.getCategoryName()); @@ -520,7 +524,7 @@ equipmentInfo.setId(equip.getEquipmentId()); equipmentInfo.setMeterStandardId(equip.getStandardId()); equipmentInfo.setMeterStandardName(equip.getStandardName()); - if(equipmentInfoMapper.updateById(equipmentInfo) < 0){ + if (equipmentInfoMapper.updateById(equipmentInfo) < 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } }); @@ -535,7 +539,7 @@ equipmentInfo.setId(id); equipmentInfo.setMeterStandardId(null); equipmentInfo.setMeterStandardName(null); - if(equipmentInfoMapper.updateById(equipmentInfo) < 0){ + if (equipmentInfoMapper.updateById(equipmentInfo) < 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } }); @@ -567,8 +571,8 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(id); - WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(equipmentInfo.getDirectorId(), equipmentInfo.getDeptId(), id, equipmentInfo.getEquipmentNo(), MessageTypeEnum.EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.EQUIPMENT.getValue(), MessageTypeEnum.EQUIPMENT.getValue(), equipmentInfo.getEquipmentName(),0, user.getId(), user.getName()); - if(messageMapper.insert(remindMessage) > 0){ + WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(equipmentInfo.getDirectorId(), equipmentInfo.getDeptId(), id, equipmentInfo.getEquipmentNo(), MessageTypeEnum.EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.EQUIPMENT.getValue(), MessageTypeEnum.EQUIPMENT.getValue(), equipmentInfo.getEquipmentName(), 0, user.getId(), user.getName()); + if (messageMapper.insert(remindMessage) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -651,7 +655,7 @@ BeanUtil.copyProperties(importDTO, equipmentInfo); equipmentInfo.setCreateUserId(authUser.getId()); equipmentInfo.setCreateUserName(authUser.getName()); - String equipmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.EQUIPMENT_IMPORT_PREFIX, maxNo+1+i); + String equipmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.EQUIPMENT_IMPORT_PREFIX, maxNo + 1 + i); equipmentInfo.setEquipmentNo(equipmentNo); equipmentInfoList.add(equipmentInfo); } @@ -720,28 +724,28 @@ throw new BusinessException(1500, String.format(validMsg, i + 1, "设备分类不能为空")); } - if(!StrUtil.isBlank(importDTO.getPurchaseDate())) { + if (!StrUtil.isBlank(importDTO.getPurchaseDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getPurchaseDate()); } catch (Exception e) { throw new BusinessException(1500, String.format(validMsg, i + 1, "购进日期，格式不正确")); } } - if(!StrUtil.isBlank(importDTO.getProduceDate())) { + if (!StrUtil.isBlank(importDTO.getProduceDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getProduceDate()); } catch (Exception e) { throw new BusinessException(1500, String.format(validMsg, i + 1, "生产日期，格式不正确")); } } - if(!StrUtil.isBlank(importDTO.getTraceDate())) { + if (!StrUtil.isBlank(importDTO.getTraceDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getTraceDate()); } catch (Exception e) { throw new BusinessException(1500, String.format(validMsg, i + 1, "溯源日期，格式不正确")); } } - if(!StrUtil.isBlank(importDTO.getMeasureValidDate())) { + if (!StrUtil.isBlank(importDTO.getMeasureValidDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getMeasureValidDate()); } catch (Exception e) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 17aacd0..d43ea88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -26,6 +27,7 @@ import java.io.IOException; import java.util.List; import java.util.Objects; +import java.util.Set; /** * @Description: 业务管理-设备收发管理 @@ -102,13 +104,20 @@ @ApiOperation("标签绑定") @PostMapping("/label/bind") - public ReturnDTO> bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { + public ReturnDTO bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { Assert.isFalse(ObjectUtils.isEmpty(labelBindDTO.getLabel()), () -> { throw new BusinessException(BusinessExceptionEnum.LABEL_IS_EMPTY); }); return dispatchService.bindLabel(labelBindDTO); } + + @ApiOperation("根据标签查询设备列表") + @PostMapping("/label/readList") + public ReturnDTO> readList(@RequestBody @Valid Set strSet) { + return dispatchService.equipmentLabelReadList(strSet); + } + @ApiOperation("催办") @PostMapping("/remindWorker") public ReturnDTO remindWorker(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 8486dad..76b7b7a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -25,6 +25,7 @@ import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import com.casic.missiles.model.business.BusinessLabExecutiveInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.resource.BizResourceStaffInfo; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; @@ -38,10 +39,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; import static com.casic.missiles.enums.business.MeasureTypeEnum.INSIDE_MEASURE; import static com.casic.missiles.enums.sample.CurrentSegmentEnum.*; @@ -160,6 +158,17 @@ } @Override + public ReturnDTO> equipmentLabelReadList(Set strSet) { + if (CollectionUtils.isEmpty(strSet)) { + return ReturnUtil.success(); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.and(QueryWrapper -> QueryWrapper.in("rfid", strSet)); + List resultList = eqptEquipmentInfoMapper.selectList(queryWrapper); + return ReturnUtil.success(resultList); + } + + @Override public ReturnDTO remindWorker(DeviceStatusChangeDTO deviceReceiveDTO) { BusinessLabExecutiveInfo labExecutiveInfo = getLabExecutiveInfo(deviceReceiveDTO); if (labExecutiveInfo != null) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index bd76a53..2118a6e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -232,11 +232,11 @@ String equipmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.EQUIPMENT_PREFIX, maxNo); equipmentInfoApproval.setEquipmentNo(equipmentNo); } - if(Objects.nonNull(equipmentInfoApproval.getDeptId())){ + if (Objects.nonNull(equipmentInfoApproval.getDeptId())) { Dept dept = deptMapper.selectById(equipmentInfoApproval.getDeptId()); equipmentInfoApproval.setDeptName(dept.getSimpleName()); } - if(Objects.nonNull(equipmentInfoApproval.getDirectorId())){ + if (Objects.nonNull(equipmentInfoApproval.getDirectorId())) { BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(equipmentInfoApproval.getDirectorId()); equipmentInfoApproval.setDirectorName(staffInfo.getStaffName()); } @@ -285,19 +285,19 @@ //给前端返回equipmentId用于提交后查询详情 Long equipmentId = equipmentInfoApprovalMapper.selectEquipmentIdById(request.getId()); //判断编辑审批类型是否有基本信息变化，从而删除草稿箱中该数据，因为非基本信息不需要走审批 - if(ApprovalTypeEnum.UPDATE == request.getApprovalType() && 1 == request.getChangeFlag()){ + if (ApprovalTypeEnum.UPDATE == request.getApprovalType() && 1 == request.getChangeFlag()) { return noBaseChangeHandle(request, equipmentId); } //判断是否登录及是否存在审批流程 BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval(); AuthUser user = ShiroKit.getUser(); - if(ApprovalTypeEnum.DELETE == request.getApprovalType() || ApprovalTypeEnum.UPDATE == request.getApprovalType()) { + if (ApprovalTypeEnum.DELETE == request.getApprovalType() || ApprovalTypeEnum.UPDATE == request.getApprovalType()) { Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); } //删除审批类型，先保存到审批表再提交 - if(ApprovalTypeEnum.DELETE == request.getApprovalType()){ + if (ApprovalTypeEnum.DELETE == request.getApprovalType()) { Long id = request.getId(); //设备主表id BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(id); equipmentInfoApproval = ConvertUtils.sourceToTarget(equipmentInfo, BizEquipmentInfoApproval.class); @@ -308,12 +308,12 @@ equipmentInfoApproval.setCreateUserId(user.getId()); equipmentInfoApproval.setCreateUserName(user.getName()); equipmentInfoApproval.setId(null); - if(equipmentInfoApprovalMapper.insert(equipmentInfoApproval) <= 0){ + if (equipmentInfoApprovalMapper.insert(equipmentInfoApproval) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } //切换为审批表id request.setId(equipmentInfoApproval.getId()); - }else{ + } else { equipmentInfoApproval.setId(request.getId()); } @@ -420,6 +420,10 @@ @Override public ReturnDTO> equipmentLabelReadList(Set strSet) { + //健壮性校验 + if (CollectionUtils.isEmpty(strSet)) { + return ReturnUtil.success(); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.and(QueryWrapper -> QueryWrapper.in("label", strSet)); List resultList = equipmentInfoMapper.selectList(queryWrapper); @@ -485,7 +489,7 @@ EquipmentApprovalListRequest listRequest = ConvertUtils.sourceToTarget(request, EquipmentApprovalListRequest.class); listRequest.setMeterStandardId(request.getStandardId()); Page equipmentInfoPage = equipmentInfoMapper.selectListPage(page, listRequest); - if(Objects.isNull(equipmentInfoPage) || CollectionUtils.isEmpty(equipmentInfoPage.getRecords())){ + if (Objects.isNull(equipmentInfoPage) || CollectionUtils.isEmpty(equipmentInfoPage.getRecords())) { return new Page<>(); } List standardEquipmentList = ConvertUtils.sourceToTarget(equipmentInfoPage.getRecords(), StandardEquipmentListResponse.class); @@ -496,7 +500,7 @@ List list = checkItemCategoryMapper.selectList(categoryWrapper); //如果标准装置仅有一个核查项分类，则自动补充核查项分类名称; //如果标准装置有多个核查项分类，展示为空，点击配置核查项时，再选择核查项分类进行具体内容配置 - if(!CollectionUtils.isEmpty(list) && list.size() == 1){ + if (!CollectionUtils.isEmpty(list) && list.size() == 1) { BizEquipmentStandardCheckItemCategory checkItemCategory = list.get(0); equip.setItemCategoryId(checkItemCategory.getId()); equip.setItemCategoryName(checkItemCategory.getCategoryName()); @@ -520,7 +524,7 @@ equipmentInfo.setId(equip.getEquipmentId()); equipmentInfo.setMeterStandardId(equip.getStandardId()); equipmentInfo.setMeterStandardName(equip.getStandardName()); - if(equipmentInfoMapper.updateById(equipmentInfo) < 0){ + if (equipmentInfoMapper.updateById(equipmentInfo) < 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } }); @@ -535,7 +539,7 @@ equipmentInfo.setId(id); equipmentInfo.setMeterStandardId(null); equipmentInfo.setMeterStandardName(null); - if(equipmentInfoMapper.updateById(equipmentInfo) < 0){ + if (equipmentInfoMapper.updateById(equipmentInfo) < 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } }); @@ -567,8 +571,8 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(id); - WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(equipmentInfo.getDirectorId(), equipmentInfo.getDeptId(), id, equipmentInfo.getEquipmentNo(), MessageTypeEnum.EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.EQUIPMENT.getValue(), MessageTypeEnum.EQUIPMENT.getValue(), equipmentInfo.getEquipmentName(),0, user.getId(), user.getName()); - if(messageMapper.insert(remindMessage) > 0){ + WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(equipmentInfo.getDirectorId(), equipmentInfo.getDeptId(), id, equipmentInfo.getEquipmentNo(), MessageTypeEnum.EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.EQUIPMENT.getValue(), MessageTypeEnum.EQUIPMENT.getValue(), equipmentInfo.getEquipmentName(), 0, user.getId(), user.getName()); + if (messageMapper.insert(remindMessage) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -651,7 +655,7 @@ BeanUtil.copyProperties(importDTO, equipmentInfo); equipmentInfo.setCreateUserId(authUser.getId()); equipmentInfo.setCreateUserName(authUser.getName()); - String equipmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.EQUIPMENT_IMPORT_PREFIX, maxNo+1+i); + String equipmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.EQUIPMENT_IMPORT_PREFIX, maxNo + 1 + i); equipmentInfo.setEquipmentNo(equipmentNo); equipmentInfoList.add(equipmentInfo); } @@ -720,28 +724,28 @@ throw new BusinessException(1500, String.format(validMsg, i + 1, "设备分类不能为空")); } - if(!StrUtil.isBlank(importDTO.getPurchaseDate())) { + if (!StrUtil.isBlank(importDTO.getPurchaseDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getPurchaseDate()); } catch (Exception e) { throw new BusinessException(1500, String.format(validMsg, i + 1, "购进日期，格式不正确")); } } - if(!StrUtil.isBlank(importDTO.getProduceDate())) { + if (!StrUtil.isBlank(importDTO.getProduceDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getProduceDate()); } catch (Exception e) { throw new BusinessException(1500, String.format(validMsg, i + 1, "生产日期，格式不正确")); } } - if(!StrUtil.isBlank(importDTO.getTraceDate())) { + if (!StrUtil.isBlank(importDTO.getTraceDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getTraceDate()); } catch (Exception e) { throw new BusinessException(1500, String.format(validMsg, i + 1, "溯源日期，格式不正确")); } } - if(!StrUtil.isBlank(importDTO.getMeasureValidDate())) { + if (!StrUtil.isBlank(importDTO.getMeasureValidDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getMeasureValidDate()); } catch (Exception e) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java index 0cef68d..9c305f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java @@ -4,8 +4,11 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.dispatch.*; import com.casic.missiles.model.business.BizBusinessOrderInfo; +import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import java.util.List; +import java.util.Set; /** * @Description: @@ -25,7 +28,9 @@ ReturnDTO statusBatchChange(DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO); - ReturnDTO> bindLabel(LabelBindDTO labelBindDTO); + ReturnDTO bindLabel(LabelBindDTO labelBindDTO); + + ReturnDTO> equipmentLabelReadList(Set strSet); ReturnDTO remindWorker(DeviceStatusChangeDTO deviceReceiveDTO); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 17aacd0..d43ea88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,6 +13,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -26,6 +27,7 @@ import java.io.IOException; import java.util.List; import java.util.Objects; +import java.util.Set; /** * @Description: 业务管理-设备收发管理 @@ -102,13 +104,20 @@ @ApiOperation("标签绑定") @PostMapping("/label/bind") - public ReturnDTO> bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { + public ReturnDTO bindLabel(@RequestBody @Valid LabelBindDTO labelBindDTO) { Assert.isFalse(ObjectUtils.isEmpty(labelBindDTO.getLabel()), () -> { throw new BusinessException(BusinessExceptionEnum.LABEL_IS_EMPTY); }); return dispatchService.bindLabel(labelBindDTO); } + + @ApiOperation("根据标签查询设备列表") + @PostMapping("/label/readList") + public ReturnDTO> readList(@RequestBody @Valid Set strSet) { + return dispatchService.equipmentLabelReadList(strSet); + } + @ApiOperation("催办") @PostMapping("/remindWorker") public ReturnDTO remindWorker(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 8486dad..76b7b7a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -25,6 +25,7 @@ import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import com.casic.missiles.model.business.BusinessLabExecutiveInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.resource.BizResourceStaffInfo; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; @@ -38,10 +39,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.Optional; +import java.util.*; import static com.casic.missiles.enums.business.MeasureTypeEnum.INSIDE_MEASURE; import static com.casic.missiles.enums.sample.CurrentSegmentEnum.*; @@ -160,6 +158,17 @@ } @Override + public ReturnDTO> equipmentLabelReadList(Set strSet) { + if (CollectionUtils.isEmpty(strSet)) { + return ReturnUtil.success(); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.and(QueryWrapper -> QueryWrapper.in("rfid", strSet)); + List resultList = eqptEquipmentInfoMapper.selectList(queryWrapper); + return ReturnUtil.success(resultList); + } + + @Override public ReturnDTO remindWorker(DeviceStatusChangeDTO deviceReceiveDTO) { BusinessLabExecutiveInfo labExecutiveInfo = getLabExecutiveInfo(deviceReceiveDTO); if (labExecutiveInfo != null) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index bd76a53..2118a6e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -232,11 +232,11 @@ String equipmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.EQUIPMENT_PREFIX, maxNo); equipmentInfoApproval.setEquipmentNo(equipmentNo); } - if(Objects.nonNull(equipmentInfoApproval.getDeptId())){ + if (Objects.nonNull(equipmentInfoApproval.getDeptId())) { Dept dept = deptMapper.selectById(equipmentInfoApproval.getDeptId()); equipmentInfoApproval.setDeptName(dept.getSimpleName()); } - if(Objects.nonNull(equipmentInfoApproval.getDirectorId())){ + if (Objects.nonNull(equipmentInfoApproval.getDirectorId())) { BizResourceStaffInfo staffInfo = staffInfoMapper.selectById(equipmentInfoApproval.getDirectorId()); equipmentInfoApproval.setDirectorName(staffInfo.getStaffName()); } @@ -285,19 +285,19 @@ //给前端返回equipmentId用于提交后查询详情 Long equipmentId = equipmentInfoApprovalMapper.selectEquipmentIdById(request.getId()); //判断编辑审批类型是否有基本信息变化，从而删除草稿箱中该数据，因为非基本信息不需要走审批 - if(ApprovalTypeEnum.UPDATE == request.getApprovalType() && 1 == request.getChangeFlag()){ + if (ApprovalTypeEnum.UPDATE == request.getApprovalType() && 1 == request.getChangeFlag()) { return noBaseChangeHandle(request, equipmentId); } //判断是否登录及是否存在审批流程 BizEquipmentInfoApproval equipmentInfoApproval = new BizEquipmentInfoApproval(); AuthUser user = ShiroKit.getUser(); - if(ApprovalTypeEnum.DELETE == request.getApprovalType() || ApprovalTypeEnum.UPDATE == request.getApprovalType()) { + if (ApprovalTypeEnum.DELETE == request.getApprovalType() || ApprovalTypeEnum.UPDATE == request.getApprovalType()) { Assert.isFalse(Objects.isNull(user), () -> { throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); } //删除审批类型，先保存到审批表再提交 - if(ApprovalTypeEnum.DELETE == request.getApprovalType()){ + if (ApprovalTypeEnum.DELETE == request.getApprovalType()) { Long id = request.getId(); //设备主表id BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(id); equipmentInfoApproval = ConvertUtils.sourceToTarget(equipmentInfo, BizEquipmentInfoApproval.class); @@ -308,12 +308,12 @@ equipmentInfoApproval.setCreateUserId(user.getId()); equipmentInfoApproval.setCreateUserName(user.getName()); equipmentInfoApproval.setId(null); - if(equipmentInfoApprovalMapper.insert(equipmentInfoApproval) <= 0){ + if (equipmentInfoApprovalMapper.insert(equipmentInfoApproval) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } //切换为审批表id request.setId(equipmentInfoApproval.getId()); - }else{ + } else { equipmentInfoApproval.setId(request.getId()); } @@ -420,6 +420,10 @@ @Override public ReturnDTO> equipmentLabelReadList(Set strSet) { + //健壮性校验 + if (CollectionUtils.isEmpty(strSet)) { + return ReturnUtil.success(); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.and(QueryWrapper -> QueryWrapper.in("label", strSet)); List resultList = equipmentInfoMapper.selectList(queryWrapper); @@ -485,7 +489,7 @@ EquipmentApprovalListRequest listRequest = ConvertUtils.sourceToTarget(request, EquipmentApprovalListRequest.class); listRequest.setMeterStandardId(request.getStandardId()); Page equipmentInfoPage = equipmentInfoMapper.selectListPage(page, listRequest); - if(Objects.isNull(equipmentInfoPage) || CollectionUtils.isEmpty(equipmentInfoPage.getRecords())){ + if (Objects.isNull(equipmentInfoPage) || CollectionUtils.isEmpty(equipmentInfoPage.getRecords())) { return new Page<>(); } List standardEquipmentList = ConvertUtils.sourceToTarget(equipmentInfoPage.getRecords(), StandardEquipmentListResponse.class); @@ -496,7 +500,7 @@ List list = checkItemCategoryMapper.selectList(categoryWrapper); //如果标准装置仅有一个核查项分类，则自动补充核查项分类名称; //如果标准装置有多个核查项分类，展示为空，点击配置核查项时，再选择核查项分类进行具体内容配置 - if(!CollectionUtils.isEmpty(list) && list.size() == 1){ + if (!CollectionUtils.isEmpty(list) && list.size() == 1) { BizEquipmentStandardCheckItemCategory checkItemCategory = list.get(0); equip.setItemCategoryId(checkItemCategory.getId()); equip.setItemCategoryName(checkItemCategory.getCategoryName()); @@ -520,7 +524,7 @@ equipmentInfo.setId(equip.getEquipmentId()); equipmentInfo.setMeterStandardId(equip.getStandardId()); equipmentInfo.setMeterStandardName(equip.getStandardName()); - if(equipmentInfoMapper.updateById(equipmentInfo) < 0){ + if (equipmentInfoMapper.updateById(equipmentInfo) < 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } }); @@ -535,7 +539,7 @@ equipmentInfo.setId(id); equipmentInfo.setMeterStandardId(null); equipmentInfo.setMeterStandardName(null); - if(equipmentInfoMapper.updateById(equipmentInfo) < 0){ + if (equipmentInfoMapper.updateById(equipmentInfo) < 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } }); @@ -567,8 +571,8 @@ throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); }); BizEquipmentInfo equipmentInfo = equipmentInfoMapper.selectById(id); - WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(equipmentInfo.getDirectorId(), equipmentInfo.getDeptId(), id, equipmentInfo.getEquipmentNo(), MessageTypeEnum.EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.EQUIPMENT.getValue(), MessageTypeEnum.EQUIPMENT.getValue(), equipmentInfo.getEquipmentName(),0, user.getId(), user.getName()); - if(messageMapper.insert(remindMessage) > 0){ + WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(equipmentInfo.getDirectorId(), equipmentInfo.getDeptId(), id, equipmentInfo.getEquipmentNo(), MessageTypeEnum.EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.EQUIPMENT.getValue(), MessageTypeEnum.EQUIPMENT.getValue(), equipmentInfo.getEquipmentName(), 0, user.getId(), user.getName()); + if (messageMapper.insert(remindMessage) > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -651,7 +655,7 @@ BeanUtil.copyProperties(importDTO, equipmentInfo); equipmentInfo.setCreateUserId(authUser.getId()); equipmentInfo.setCreateUserName(authUser.getName()); - String equipmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.EQUIPMENT_IMPORT_PREFIX, maxNo+1+i); + String equipmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.EQUIPMENT_IMPORT_PREFIX, maxNo + 1 + i); equipmentInfo.setEquipmentNo(equipmentNo); equipmentInfoList.add(equipmentInfo); } @@ -720,28 +724,28 @@ throw new BusinessException(1500, String.format(validMsg, i + 1, "设备分类不能为空")); } - if(!StrUtil.isBlank(importDTO.getPurchaseDate())) { + if (!StrUtil.isBlank(importDTO.getPurchaseDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getPurchaseDate()); } catch (Exception e) { throw new BusinessException(1500, String.format(validMsg, i + 1, "购进日期，格式不正确")); } } - if(!StrUtil.isBlank(importDTO.getProduceDate())) { + if (!StrUtil.isBlank(importDTO.getProduceDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getProduceDate()); } catch (Exception e) { throw new BusinessException(1500, String.format(validMsg, i + 1, "生产日期，格式不正确")); } } - if(!StrUtil.isBlank(importDTO.getTraceDate())) { + if (!StrUtil.isBlank(importDTO.getTraceDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getTraceDate()); } catch (Exception e) { throw new BusinessException(1500, String.format(validMsg, i + 1, "溯源日期，格式不正确")); } } - if(!StrUtil.isBlank(importDTO.getMeasureValidDate())) { + if (!StrUtil.isBlank(importDTO.getMeasureValidDate())) { try { new SimpleDateFormat("yyyy-MM-dd").parse(importDTO.getMeasureValidDate()); } catch (Exception e) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java index 0cef68d..9c305f3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java @@ -4,8 +4,11 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.business.dispatch.*; import com.casic.missiles.model.business.BizBusinessOrderInfo; +import com.casic.missiles.model.eqpt.EqptEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; import java.util.List; +import java.util.Set; /** * @Description: @@ -25,7 +28,9 @@ ReturnDTO statusBatchChange(DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO); - ReturnDTO> bindLabel(LabelBindDTO labelBindDTO); + ReturnDTO bindLabel(LabelBindDTO labelBindDTO); + + ReturnDTO> equipmentLabelReadList(Set strSet); ReturnDTO remindWorker(DeviceStatusChangeDTO deviceReceiveDTO); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index e6c5f7b..42ddef7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.certificate.FilePrintRegister; import com.casic.missiles.model.file.ImageConfig; import com.casic.missiles.service.listeners.util.ParseWord07; +import com.casic.missiles.service.listeners.util.PdfUtils; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.config.ConfigureBuilder; @@ -196,12 +197,12 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { -// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); + PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 - Document document = new Document(); - document.loadFromFile(wordNewUrl); - document.saveToFile(pdfNewUrl, FileFormat.PDF); - document.dispose(); +// Document document = new Document(); +// document.loadFromFile(wordNewUrl); +// document.saveToFile(pdfNewUrl, FileFormat.PDF); +// document.dispose(); } /**