diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java new file mode 100644 index 0000000..3e9be1f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -0,0 +1,100 @@ +package com.casic.missiles.listeners.flowable; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.EquipmentApplyProcessEnum; +import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; +import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.system.SystemFlowForm; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.flowable.engine.repository.ProcessDefinition; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class ProcessUpdateStateListener implements ExecutionListener { + + @Resource + private RepositoryService repositoryService; + + @Resource + private SystemFlowFormMapper flowFormMapper; + + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + + @Resource + private MeterFixedAssetsMapper meterFixedAssetsMapper; + + @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Override + public void notify(DelegateExecution execution) { + System.err.println("审批通过触发监听器:"+execution); + ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_def_id", processDefinition.getKey()); + wrapper.eq("is_del", 0); + SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); + String id = execution.getProcessInstanceBusinessKey(); + switch (systemFlowForm.getFormId()){ + // 标准装置申请 + /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + // 设备状态管理申请 + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + // 设备借用领用申请 + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + } + } + + private void updateEquipmentApplyState(String id, String state) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id).set("process_result", state); + if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateEquipmentState(String id, String state) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", id); + List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); + List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",equipmentIds).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateStandardState(String businessKey,String state) { + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java new file mode 100644 index 0000000..3e9be1f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -0,0 +1,100 @@ +package com.casic.missiles.listeners.flowable; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.EquipmentApplyProcessEnum; +import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; +import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.system.SystemFlowForm; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.flowable.engine.repository.ProcessDefinition; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class ProcessUpdateStateListener implements ExecutionListener { + + @Resource + private RepositoryService repositoryService; + + @Resource + private SystemFlowFormMapper flowFormMapper; + + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + + @Resource + private MeterFixedAssetsMapper meterFixedAssetsMapper; + + @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Override + public void notify(DelegateExecution execution) { + System.err.println("审批通过触发监听器:"+execution); + ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_def_id", processDefinition.getKey()); + wrapper.eq("is_del", 0); + SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); + String id = execution.getProcessInstanceBusinessKey(); + switch (systemFlowForm.getFormId()){ + // 标准装置申请 + /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + // 设备状态管理申请 + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + // 设备借用领用申请 + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + } + } + + private void updateEquipmentApplyState(String id, String state) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id).set("process_result", state); + if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateEquipmentState(String id, String state) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", id); + List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); + List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",equipmentIds).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateStandardState(String businessKey,String state) { + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 7a0049e..655d8e0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -13,9 +13,9 @@ List measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - List standardTrend(String startTime, String endTime); + List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); - int queryOvertimeNum(List businessKeys, String toString); + int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java new file mode 100644 index 0000000..3e9be1f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -0,0 +1,100 @@ +package com.casic.missiles.listeners.flowable; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.EquipmentApplyProcessEnum; +import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; +import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.system.SystemFlowForm; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.flowable.engine.repository.ProcessDefinition; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class ProcessUpdateStateListener implements ExecutionListener { + + @Resource + private RepositoryService repositoryService; + + @Resource + private SystemFlowFormMapper flowFormMapper; + + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + + @Resource + private MeterFixedAssetsMapper meterFixedAssetsMapper; + + @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Override + public void notify(DelegateExecution execution) { + System.err.println("审批通过触发监听器:"+execution); + ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_def_id", processDefinition.getKey()); + wrapper.eq("is_del", 0); + SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); + String id = execution.getProcessInstanceBusinessKey(); + switch (systemFlowForm.getFormId()){ + // 标准装置申请 + /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + // 设备状态管理申请 + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + // 设备借用领用申请 + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + } + } + + private void updateEquipmentApplyState(String id, String state) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id).set("process_result", state); + if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateEquipmentState(String id, String state) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", id); + List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); + List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",equipmentIds).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateStandardState(String businessKey,String state) { + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 7a0049e..655d8e0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -13,9 +13,9 @@ List measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - List standardTrend(String startTime, String endTime); + List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); - int queryOvertimeNum(List businessKeys, String toString); + int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index ab1ff2e..7d80255 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; @@ -32,11 +31,13 @@ import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -45,6 +46,7 @@ import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service("IEquipmentAcceptanceCheckService") public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService { @@ -151,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -178,6 +176,7 @@ } @Override + @Transactional public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -196,16 +195,15 @@ if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){ equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(!flag){ - return ReturnUtil.failed("新增失败"); - } + if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } return ReturnUtil.success(equipmentApply.getId()); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -214,7 +212,7 @@ if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -231,12 +229,14 @@ } iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName()); } catch (IOException e) { + log.error("样品导出出现异常,异常信息为:", e); e.printStackTrace(); } } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java new file mode 100644 index 0000000..3e9be1f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -0,0 +1,100 @@ +package com.casic.missiles.listeners.flowable; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.EquipmentApplyProcessEnum; +import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; +import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.system.SystemFlowForm; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.flowable.engine.repository.ProcessDefinition; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class ProcessUpdateStateListener implements ExecutionListener { + + @Resource + private RepositoryService repositoryService; + + @Resource + private SystemFlowFormMapper flowFormMapper; + + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + + @Resource + private MeterFixedAssetsMapper meterFixedAssetsMapper; + + @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Override + public void notify(DelegateExecution execution) { + System.err.println("审批通过触发监听器:"+execution); + ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_def_id", processDefinition.getKey()); + wrapper.eq("is_del", 0); + SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); + String id = execution.getProcessInstanceBusinessKey(); + switch (systemFlowForm.getFormId()){ + // 标准装置申请 + /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + // 设备状态管理申请 + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + // 设备借用领用申请 + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + } + } + + private void updateEquipmentApplyState(String id, String state) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id).set("process_result", state); + if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateEquipmentState(String id, String state) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", id); + List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); + List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",equipmentIds).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateStandardState(String businessKey,String state) { + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 7a0049e..655d8e0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -13,9 +13,9 @@ List measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - List standardTrend(String startTime, String endTime); + List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); - int queryOvertimeNum(List businessKeys, String toString); + int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index ab1ff2e..7d80255 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; @@ -32,11 +31,13 @@ import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -45,6 +46,7 @@ import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service("IEquipmentAcceptanceCheckService") public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService { @@ -151,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -178,6 +176,7 @@ } @Override + @Transactional public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -196,16 +195,15 @@ if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){ equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(!flag){ - return ReturnUtil.failed("新增失败"); - } + if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } return ReturnUtil.success(equipmentApply.getId()); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -214,7 +212,7 @@ if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -231,12 +229,14 @@ } iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName()); } catch (IOException e) { + log.error("样品导出出现异常,异常信息为:", e); e.printStackTrace(); } } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index dc79adf..6a02d14 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -38,6 +38,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -139,10 +140,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -159,6 +156,7 @@ } @Override + @Transactional public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -189,11 +187,10 @@ } if(equipmentSaveBatchFlg && saveBatchFlg){ return ReturnUtil.success(id); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ @@ -222,6 +219,7 @@ } @Override + @Transactional public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -239,10 +237,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -259,9 +258,9 @@ if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -285,21 +284,21 @@ public ReturnDTO borrowEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); // 通过id修改处理结果 - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("借用失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public ReturnDTO returnEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("归还失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -309,10 +308,11 @@ if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("处理失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) { String formId = request.getFormId(); // 发起流程 @@ -335,6 +335,7 @@ } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -358,8 +359,8 @@ //更新状态为审批中 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java new file mode 100644 index 0000000..3e9be1f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -0,0 +1,100 @@ +package com.casic.missiles.listeners.flowable; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.EquipmentApplyProcessEnum; +import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; +import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.system.SystemFlowForm; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.flowable.engine.repository.ProcessDefinition; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class ProcessUpdateStateListener implements ExecutionListener { + + @Resource + private RepositoryService repositoryService; + + @Resource + private SystemFlowFormMapper flowFormMapper; + + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + + @Resource + private MeterFixedAssetsMapper meterFixedAssetsMapper; + + @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Override + public void notify(DelegateExecution execution) { + System.err.println("审批通过触发监听器:"+execution); + ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_def_id", processDefinition.getKey()); + wrapper.eq("is_del", 0); + SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); + String id = execution.getProcessInstanceBusinessKey(); + switch (systemFlowForm.getFormId()){ + // 标准装置申请 + /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + // 设备状态管理申请 + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + // 设备借用领用申请 + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + } + } + + private void updateEquipmentApplyState(String id, String state) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id).set("process_result", state); + if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateEquipmentState(String id, String state) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", id); + List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); + List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",equipmentIds).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateStandardState(String businessKey,String state) { + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 7a0049e..655d8e0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -13,9 +13,9 @@ List measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - List standardTrend(String startTime, String endTime); + List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); - int queryOvertimeNum(List businessKeys, String toString); + int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index ab1ff2e..7d80255 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; @@ -32,11 +31,13 @@ import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -45,6 +46,7 @@ import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service("IEquipmentAcceptanceCheckService") public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService { @@ -151,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -178,6 +176,7 @@ } @Override + @Transactional public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -196,16 +195,15 @@ if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){ equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(!flag){ - return ReturnUtil.failed("新增失败"); - } + if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } return ReturnUtil.success(equipmentApply.getId()); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -214,7 +212,7 @@ if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -231,12 +229,14 @@ } iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName()); } catch (IOException e) { + log.error("样品导出出现异常,异常信息为:", e); e.printStackTrace(); } } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index dc79adf..6a02d14 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -38,6 +38,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -139,10 +140,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -159,6 +156,7 @@ } @Override + @Transactional public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -189,11 +187,10 @@ } if(equipmentSaveBatchFlg && saveBatchFlg){ return ReturnUtil.success(id); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ @@ -222,6 +219,7 @@ } @Override + @Transactional public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -239,10 +237,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -259,9 +258,9 @@ if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -285,21 +284,21 @@ public ReturnDTO borrowEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); // 通过id修改处理结果 - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("借用失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public ReturnDTO returnEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("归还失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -309,10 +308,11 @@ if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("处理失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) { String formId = request.getFormId(); // 发起流程 @@ -335,6 +335,7 @@ } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -358,8 +359,8 @@ //更新状态为审批中 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java index 52f97d8..7c4fdbc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java @@ -8,7 +8,9 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper; import com.casic.missiles.model.equipment.EquipmentCheckInfo; @@ -19,6 +21,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -58,7 +61,7 @@ if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -73,6 +76,7 @@ } @Override + @Transactional public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) { long maxNo = equipmentCheckInfoMapper.selectMaxNo(); String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo); @@ -85,11 +89,10 @@ boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList()); if(saveBatchFlg){ return ReturnUtil.success(); - }else{ - return ReturnUtil.failed("附件添加失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java new file mode 100644 index 0000000..3e9be1f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -0,0 +1,100 @@ +package com.casic.missiles.listeners.flowable; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.EquipmentApplyProcessEnum; +import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; +import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.system.SystemFlowForm; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.flowable.engine.repository.ProcessDefinition; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class ProcessUpdateStateListener implements ExecutionListener { + + @Resource + private RepositoryService repositoryService; + + @Resource + private SystemFlowFormMapper flowFormMapper; + + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + + @Resource + private MeterFixedAssetsMapper meterFixedAssetsMapper; + + @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Override + public void notify(DelegateExecution execution) { + System.err.println("审批通过触发监听器:"+execution); + ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_def_id", processDefinition.getKey()); + wrapper.eq("is_del", 0); + SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); + String id = execution.getProcessInstanceBusinessKey(); + switch (systemFlowForm.getFormId()){ + // 标准装置申请 + /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + // 设备状态管理申请 + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + // 设备借用领用申请 + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + } + } + + private void updateEquipmentApplyState(String id, String state) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id).set("process_result", state); + if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateEquipmentState(String id, String state) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", id); + List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); + List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",equipmentIds).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateStandardState(String businessKey,String state) { + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 7a0049e..655d8e0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -13,9 +13,9 @@ List measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - List standardTrend(String startTime, String endTime); + List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); - int queryOvertimeNum(List businessKeys, String toString); + int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index ab1ff2e..7d80255 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; @@ -32,11 +31,13 @@ import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -45,6 +46,7 @@ import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service("IEquipmentAcceptanceCheckService") public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService { @@ -151,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -178,6 +176,7 @@ } @Override + @Transactional public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -196,16 +195,15 @@ if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){ equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(!flag){ - return ReturnUtil.failed("新增失败"); - } + if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } return ReturnUtil.success(equipmentApply.getId()); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -214,7 +212,7 @@ if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -231,12 +229,14 @@ } iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName()); } catch (IOException e) { + log.error("样品导出出现异常,异常信息为:", e); e.printStackTrace(); } } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index dc79adf..6a02d14 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -38,6 +38,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -139,10 +140,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -159,6 +156,7 @@ } @Override + @Transactional public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -189,11 +187,10 @@ } if(equipmentSaveBatchFlg && saveBatchFlg){ return ReturnUtil.success(id); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ @@ -222,6 +219,7 @@ } @Override + @Transactional public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -239,10 +237,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -259,9 +258,9 @@ if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -285,21 +284,21 @@ public ReturnDTO borrowEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); // 通过id修改处理结果 - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("借用失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public ReturnDTO returnEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("归还失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -309,10 +308,11 @@ if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("处理失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) { String formId = request.getFormId(); // 发起流程 @@ -335,6 +335,7 @@ } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -358,8 +359,8 @@ //更新状态为审批中 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java index 52f97d8..7c4fdbc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java @@ -8,7 +8,9 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper; import com.casic.missiles.model.equipment.EquipmentCheckInfo; @@ -19,6 +21,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -58,7 +61,7 @@ if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -73,6 +76,7 @@ } @Override + @Transactional public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) { long maxNo = equipmentCheckInfoMapper.selectMaxNo(); String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo); @@ -85,11 +89,10 @@ boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList()); if(saveBatchFlg){ return ReturnUtil.success(); - }else{ - return ReturnUtil.failed("附件添加失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index ebd8ff6..20d6666 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -35,6 +35,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -152,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(item); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -177,7 +174,7 @@ } // 通过对应设备id查询设备详细信息 QueryWrapper fixedAssetsWrapper = new QueryWrapper<>(); - if(CollectionUtils.isEmpty(equipmentIds)){ + if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){ fixedAssetsWrapper.in("id", equipmentIds); List meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper); result.setFixedAssetsList(meterFixedAssets); @@ -191,6 +188,7 @@ } @Override + @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); @@ -217,21 +215,21 @@ } if(fileListResult&&equipmentListResult){ return ReturnUtil.success(meterStandardApply.getId()); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ return ReturnUtil.success(); } - return ReturnUtil.failed("编辑失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -268,6 +266,7 @@ } @Override + @Transactional public ReturnDTO approvalDelete(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -285,10 +284,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); @@ -303,7 +303,7 @@ runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); return ReturnUtil.success(); } - return ReturnUtil.failed("编辑失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java new file mode 100644 index 0000000..3e9be1f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -0,0 +1,100 @@ +package com.casic.missiles.listeners.flowable; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.EquipmentApplyProcessEnum; +import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; +import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.system.SystemFlowForm; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.flowable.engine.repository.ProcessDefinition; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class ProcessUpdateStateListener implements ExecutionListener { + + @Resource + private RepositoryService repositoryService; + + @Resource + private SystemFlowFormMapper flowFormMapper; + + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + + @Resource + private MeterFixedAssetsMapper meterFixedAssetsMapper; + + @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Override + public void notify(DelegateExecution execution) { + System.err.println("审批通过触发监听器:"+execution); + ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_def_id", processDefinition.getKey()); + wrapper.eq("is_del", 0); + SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); + String id = execution.getProcessInstanceBusinessKey(); + switch (systemFlowForm.getFormId()){ + // 标准装置申请 + /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + // 设备状态管理申请 + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + // 设备借用领用申请 + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + } + } + + private void updateEquipmentApplyState(String id, String state) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id).set("process_result", state); + if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateEquipmentState(String id, String state) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", id); + List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); + List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",equipmentIds).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateStandardState(String businessKey,String state) { + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 7a0049e..655d8e0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -13,9 +13,9 @@ List measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - List standardTrend(String startTime, String endTime); + List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); - int queryOvertimeNum(List businessKeys, String toString); + int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index ab1ff2e..7d80255 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; @@ -32,11 +31,13 @@ import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -45,6 +46,7 @@ import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service("IEquipmentAcceptanceCheckService") public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService { @@ -151,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -178,6 +176,7 @@ } @Override + @Transactional public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -196,16 +195,15 @@ if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){ equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(!flag){ - return ReturnUtil.failed("新增失败"); - } + if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } return ReturnUtil.success(equipmentApply.getId()); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -214,7 +212,7 @@ if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -231,12 +229,14 @@ } iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName()); } catch (IOException e) { + log.error("样品导出出现异常,异常信息为:", e); e.printStackTrace(); } } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index dc79adf..6a02d14 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -38,6 +38,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -139,10 +140,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -159,6 +156,7 @@ } @Override + @Transactional public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -189,11 +187,10 @@ } if(equipmentSaveBatchFlg && saveBatchFlg){ return ReturnUtil.success(id); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ @@ -222,6 +219,7 @@ } @Override + @Transactional public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -239,10 +237,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -259,9 +258,9 @@ if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -285,21 +284,21 @@ public ReturnDTO borrowEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); // 通过id修改处理结果 - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("借用失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public ReturnDTO returnEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("归还失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -309,10 +308,11 @@ if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("处理失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) { String formId = request.getFormId(); // 发起流程 @@ -335,6 +335,7 @@ } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -358,8 +359,8 @@ //更新状态为审批中 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java index 52f97d8..7c4fdbc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java @@ -8,7 +8,9 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper; import com.casic.missiles.model.equipment.EquipmentCheckInfo; @@ -19,6 +21,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -58,7 +61,7 @@ if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -73,6 +76,7 @@ } @Override + @Transactional public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) { long maxNo = equipmentCheckInfoMapper.selectMaxNo(); String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo); @@ -85,11 +89,10 @@ boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList()); if(saveBatchFlg){ return ReturnUtil.success(); - }else{ - return ReturnUtil.failed("附件添加失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index ebd8ff6..20d6666 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -35,6 +35,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -152,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(item); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -177,7 +174,7 @@ } // 通过对应设备id查询设备详细信息 QueryWrapper fixedAssetsWrapper = new QueryWrapper<>(); - if(CollectionUtils.isEmpty(equipmentIds)){ + if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){ fixedAssetsWrapper.in("id", equipmentIds); List meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper); result.setFixedAssetsList(meterFixedAssets); @@ -191,6 +188,7 @@ } @Override + @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); @@ -217,21 +215,21 @@ } if(fileListResult&&equipmentListResult){ return ReturnUtil.success(meterStandardApply.getId()); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ return ReturnUtil.success(); } - return ReturnUtil.failed("编辑失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -268,6 +266,7 @@ } @Override + @Transactional public ReturnDTO approvalDelete(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -285,10 +284,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); @@ -303,7 +303,7 @@ runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); return ReturnUtil.success(); } - return ReturnUtil.failed("编辑失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index b1b937c..c9bbbff 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -105,10 +105,6 @@ } DictCodeUtils.convertDictCodeToName(item); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(StateManageResponse::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java new file mode 100644 index 0000000..3e9be1f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -0,0 +1,100 @@ +package com.casic.missiles.listeners.flowable; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.EquipmentApplyProcessEnum; +import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; +import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.system.SystemFlowForm; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.flowable.engine.repository.ProcessDefinition; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class ProcessUpdateStateListener implements ExecutionListener { + + @Resource + private RepositoryService repositoryService; + + @Resource + private SystemFlowFormMapper flowFormMapper; + + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + + @Resource + private MeterFixedAssetsMapper meterFixedAssetsMapper; + + @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Override + public void notify(DelegateExecution execution) { + System.err.println("审批通过触发监听器:"+execution); + ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_def_id", processDefinition.getKey()); + wrapper.eq("is_del", 0); + SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); + String id = execution.getProcessInstanceBusinessKey(); + switch (systemFlowForm.getFormId()){ + // 标准装置申请 + /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + // 设备状态管理申请 + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + // 设备借用领用申请 + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + } + } + + private void updateEquipmentApplyState(String id, String state) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id).set("process_result", state); + if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateEquipmentState(String id, String state) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", id); + List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); + List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",equipmentIds).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateStandardState(String businessKey,String state) { + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 7a0049e..655d8e0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -13,9 +13,9 @@ List measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - List standardTrend(String startTime, String endTime); + List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); - int queryOvertimeNum(List businessKeys, String toString); + int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index ab1ff2e..7d80255 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; @@ -32,11 +31,13 @@ import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -45,6 +46,7 @@ import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service("IEquipmentAcceptanceCheckService") public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService { @@ -151,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -178,6 +176,7 @@ } @Override + @Transactional public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -196,16 +195,15 @@ if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){ equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(!flag){ - return ReturnUtil.failed("新增失败"); - } + if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } return ReturnUtil.success(equipmentApply.getId()); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -214,7 +212,7 @@ if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -231,12 +229,14 @@ } iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName()); } catch (IOException e) { + log.error("样品导出出现异常,异常信息为:", e); e.printStackTrace(); } } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index dc79adf..6a02d14 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -38,6 +38,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -139,10 +140,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -159,6 +156,7 @@ } @Override + @Transactional public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -189,11 +187,10 @@ } if(equipmentSaveBatchFlg && saveBatchFlg){ return ReturnUtil.success(id); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ @@ -222,6 +219,7 @@ } @Override + @Transactional public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -239,10 +237,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -259,9 +258,9 @@ if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -285,21 +284,21 @@ public ReturnDTO borrowEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); // 通过id修改处理结果 - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("借用失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public ReturnDTO returnEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("归还失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -309,10 +308,11 @@ if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("处理失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) { String formId = request.getFormId(); // 发起流程 @@ -335,6 +335,7 @@ } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -358,8 +359,8 @@ //更新状态为审批中 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java index 52f97d8..7c4fdbc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java @@ -8,7 +8,9 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper; import com.casic.missiles.model.equipment.EquipmentCheckInfo; @@ -19,6 +21,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -58,7 +61,7 @@ if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -73,6 +76,7 @@ } @Override + @Transactional public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) { long maxNo = equipmentCheckInfoMapper.selectMaxNo(); String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo); @@ -85,11 +89,10 @@ boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList()); if(saveBatchFlg){ return ReturnUtil.success(); - }else{ - return ReturnUtil.failed("附件添加失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index ebd8ff6..20d6666 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -35,6 +35,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -152,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(item); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -177,7 +174,7 @@ } // 通过对应设备id查询设备详细信息 QueryWrapper fixedAssetsWrapper = new QueryWrapper<>(); - if(CollectionUtils.isEmpty(equipmentIds)){ + if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){ fixedAssetsWrapper.in("id", equipmentIds); List meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper); result.setFixedAssetsList(meterFixedAssets); @@ -191,6 +188,7 @@ } @Override + @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); @@ -217,21 +215,21 @@ } if(fileListResult&&equipmentListResult){ return ReturnUtil.success(meterStandardApply.getId()); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ return ReturnUtil.success(); } - return ReturnUtil.failed("编辑失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -268,6 +266,7 @@ } @Override + @Transactional public ReturnDTO approvalDelete(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -285,10 +284,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); @@ -303,7 +303,7 @@ runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); return ReturnUtil.success(); } - return ReturnUtil.failed("编辑失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index b1b937c..c9bbbff 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -105,10 +105,6 @@ } DictCodeUtils.convertDictCodeToName(item); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(StateManageResponse::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java index d3f8c1e..85e7c50 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java @@ -174,7 +174,7 @@ } @Override - public ReturnDTO myselfEquipment() { + public ReturnDTO myselfEquipment() { EquipmentWorkbenchResponse response = new EquipmentWorkbenchResponse(); AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { @@ -183,8 +183,8 @@ // 待检定数量 List businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL)); response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys,user.getId().toString())); - equipmentWorkbenchMapper.queryOvertimeNum(businessKeys,user.getId().toString()); - return null; + response.setOvertimeNum(equipmentWorkbenchMapper.queryOvertimeNum(businessKeys,user.getId().toString())); + return ReturnUtil.success(response); } public List getResultList(List resList) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java index baadff0..361e063 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java @@ -49,7 +49,10 @@ @ApiOperation("设备检修保养验收单列表") @PostMapping("/acceptanceCheckList") @ResponseBody - public ReturnDTO> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{ + public ReturnDTO> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request))); } @@ -60,7 +63,10 @@ @ApiOperation("设备检修保养验收单详细信息") @PostMapping("/acceptanceCheckInfo") @ResponseBody - public ReturnDTO acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO)); } @@ -70,7 +76,10 @@ @ApiOperation("设备检修保养验收单新建") @PostMapping("/addAcceptanceCheck") @ResponseBody - public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if (bindingResult.hasErrors()) { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply); } @@ -94,7 +103,10 @@ @ApiOperation("设备检修保养验收单审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentApplyService.deleteEquipmentApply(request); } @@ -104,7 +116,10 @@ @ApiOperation("设备检修保养验收单编辑") @PostMapping("/updateAcceptanceCheckInfo") @ResponseBody - public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index 40eb8fd..596daef 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -57,7 +57,10 @@ @ApiOperation("设备借用-领用申请列表查询") @PostMapping("/equipmentApplyList") @ResponseBody - public ReturnDTO> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{ + public ReturnDTO> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request))); } @@ -68,7 +71,10 @@ @ApiOperation("设备借用-领用申请详细信息") @PostMapping("/equipmentApplyInfo") @ResponseBody - public ReturnDTO equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO)); } @@ -78,7 +84,10 @@ @ApiOperation("设备借用-领用申请新建(保存)") @PostMapping("/addEquipmentApply") @ResponseBody - public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{ + public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.addEquipmentApply(equipmentApply); } @@ -98,7 +107,10 @@ @ApiOperation("设备借用-领用申请审批操作-删除") @PostMapping("deleteEquipmentApply") @ResponseBody - public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.deleteEquipmentApply(request); } @@ -108,7 +120,10 @@ @ApiOperation("设备借用-领用申请信息编辑") @PostMapping("/updateEquipmentApply") @ResponseBody - public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return equipmentApplyService.updateEquipmentApply(equipmentApply); } @@ -129,6 +144,9 @@ @PostMapping("/borrowEquipmentApply") @ResponseBody public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.borrowEquipmentApply(idDto); } @@ -139,6 +157,9 @@ @PostMapping("/returnEquipmentApply") @ResponseBody public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return equipmentApplyService.returnEquipmentApply(idDto); } @@ -146,7 +167,10 @@ @ApiOperation("更新设备处理状态(领用/退领)") @PostMapping("/updateProcessResult") @ResponseBody - public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception { + public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } DictCodeUtils.validDictCode(request); return equipmentApplyService.updateProcessResult(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java index d4708c5..d2229e9 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java @@ -1,6 +1,7 @@ package com.casic.missiles.controller.equipment; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -9,16 +10,21 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentCheckInfo; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentCheckInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.Objects; /** **

@@ -44,7 +50,10 @@ @ApiOperation("设备管理点检查列表") @PostMapping("/checkInfoList") @ResponseBody - public ReturnDTO> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{ + public ReturnDTO> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request))); } @@ -55,7 +64,10 @@ @ApiOperation("设备管理点检查列表删除") @PostMapping("/deleteCheckInfo") @ResponseBody - public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) { + public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) { + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return iEquipmentCheckInfoService.deleteCheckInfo(idDto); } @@ -66,7 +78,10 @@ @ApiOperation("设备管理点检查详细信息") @PostMapping("/selectCheckInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto)); } @@ -76,7 +91,10 @@ @ApiOperation("备管理点检查新建") @PostMapping("/addCheckInfo") @ResponseBody - public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{ + public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index 22bdf5f..aeb15a2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -54,7 +54,10 @@ @ApiOperation("标准装置申请列表") @PostMapping("/standardEquipmentApplyList") @ResponseBody - public ReturnDTO> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{ + public ReturnDTO> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request))); } @@ -65,7 +68,10 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO)); } @@ -75,7 +81,10 @@ @ApiOperation("标准装置申请新建") @PostMapping("/addStandardEquipmentApply") @ResponseBody - public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{ + public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply); } @@ -85,7 +94,10 @@ @ApiOperation("标准装置申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.submitStandardEquipmentApply(request); } @@ -96,7 +108,10 @@ @ApiOperation("审批操作-删除") @PostMapping("/approval/operate/delete") @ResponseBody - public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.approvalDelete(request); } @@ -107,7 +122,10 @@ @ApiOperation("标准装置申请信息编辑") @PostMapping("/updateStandardEquipmentApply") @ResponseBody - public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) { + public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index 2f52ad0..be54567 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -56,7 +56,10 @@ @ApiOperation("状态管理申请列表") @PostMapping("/stateManageList") @ResponseBody - public ReturnDTO> applyList(@RequestBody StateManageRequest request) throws Exception{ + public ReturnDTO> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request))); } @@ -67,7 +70,10 @@ @ApiOperation("状态管理申请列表删除") @PostMapping("/deleteStateManageList") @ResponseBody - public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) { + public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.deleteEquipmentApply(request); } @@ -77,7 +83,10 @@ @ApiOperation("状态管理申请提交") @PostMapping("/submitStandardEquipmentApply") @ResponseBody - public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) { + public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.submitEquipmentApply(request); } @@ -87,7 +96,10 @@ @ApiOperation("状态管理申请详细信息") @PostMapping("/selectStateManageInfo") @ResponseBody - public ReturnDTO selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{ + public ReturnDTO selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{ + Assert.isFalse(Objects.isNull(idDto.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto)); } @@ -97,7 +109,10 @@ @ApiOperation("设状态管理申请新建") @PostMapping("/addStateManageInfo") @ResponseBody - public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{ + public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{ + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply); } @@ -109,7 +124,10 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + if(bindingResult.hasErrors()){ + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + } return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java deleted file mode 100644 index fa43312..0000000 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.controller.flowable; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; - -public class UpdateState implements JavaDelegate { - - @Override - public void execute(DelegateExecution delegateExecution) { - System.err.println("服务节点调用"); - } -} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index af602f0..385406c 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,24 +1,26 @@ package com.casic.missiles.enums; -public enum EquipmentApplyProcessEnum { +public interface EquipmentApplyProcessEnum { + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 待借用 + String WAIT_BORROWED = "1"; + // 已借用 + String ALREADY_BORROWED = "2"; + // 已归还 + String ALREADY_RETURN = "3"; + // 在用(启封) + String USE = "1"; + // 闲置 + String IDLE = "2"; + // 封存 + String SEALED = "3"; + // 报废 + String SCRAP = "4"; + // 处置 + String MANAGEMENT = "5"; - WAIT_BORROWED("1", "待借用"), - ALREADY_BORROWED("2", "已借用"), - ALREADY_RETURN("3", "已归还"); - private final String code; - private final String value; - - EquipmentApplyProcessEnum(String code, String value) { - this.code = code; - this.value = value; - } - - public String getCode() { - return code; - } - - public String getValue() { - return value; - } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java new file mode 100644 index 0000000..3e9be1f --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -0,0 +1,100 @@ +package com.casic.missiles.listeners.flowable; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.enums.ApplyFromIdEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.EquipmentApplyProcessEnum; +import com.casic.missiles.enums.MeasureStatusEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; +import com.casic.missiles.mapper.system.SystemFlowFormMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.system.SystemFlowForm; +import lombok.extern.slf4j.Slf4j; +import org.flowable.engine.RepositoryService; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.ExecutionListener; +import org.flowable.engine.repository.ProcessDefinition; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class ProcessUpdateStateListener implements ExecutionListener { + + @Resource + private RepositoryService repositoryService; + + @Resource + private SystemFlowFormMapper flowFormMapper; + + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + + @Resource + private MeterFixedAssetsMapper meterFixedAssetsMapper; + + @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Override + public void notify(DelegateExecution execution) { + System.err.println("审批通过触发监听器:"+execution); + ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("pro_def_id", processDefinition.getKey()); + wrapper.eq("is_del", 0); + SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper); + String id = execution.getProcessInstanceBusinessKey(); + switch (systemFlowForm.getFormId()){ + // 标准装置申请 + /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; + case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + // 设备状态管理申请 + case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; + case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; + case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break; + case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break; + case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break; + // 设备借用领用申请 + case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break; + case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break; + } + } + + private void updateEquipmentApplyState(String id, String state) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",id).set("process_result", state); + if(equipmentApplyMapper.update(null, updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateEquipmentState(String id, String state) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", id); + List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); + List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",equipmentIds).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } + + private void updateStandardState(String businessKey,String state) { + } +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 7a0049e..655d8e0 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -13,9 +13,9 @@ List measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - List standardTrend(String startTime, String endTime); + List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); - int queryOvertimeNum(List businessKeys, String toString); + int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index ab1ff2e..7d80255 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -1,7 +1,6 @@ package com.casic.missiles.service.Impl.equipment; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; @@ -32,11 +31,13 @@ import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -45,6 +46,7 @@ import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service("IEquipmentAcceptanceCheckService") public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService { @@ -151,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -178,6 +176,7 @@ } @Override + @Transactional public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -196,16 +195,15 @@ if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){ equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId())); boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList()); - if(!flag){ - return ReturnUtil.failed("新增失败"); - } + if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } return ReturnUtil.success(equipmentApply.getId()); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -214,7 +212,7 @@ if(updateFlg>0 && saveOrUpdateBatch){ return ReturnUtil.success(); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -231,12 +229,14 @@ } iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName()); } catch (IOException e) { + log.error("样品导出出现异常,异常信息为:", e); e.printStackTrace(); } } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index dc79adf..6a02d14 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -38,6 +38,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -139,10 +140,6 @@ } DictCodeUtils.convertDictCodeToName(equipmentApply); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -159,6 +156,7 @@ } @Override + @Transactional public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) { Long maxNo = equipmentApplyMapper.selectMaxNo(); // 生成编号 @@ -189,11 +187,10 @@ } if(equipmentSaveBatchFlg && saveBatchFlg){ return ReturnUtil.success(id); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ @@ -222,6 +219,7 @@ } @Override + @Transactional public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -239,10 +237,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -259,9 +258,9 @@ if(saveOrUpdateBatchFlg){ return ReturnUtil.success(); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -285,21 +284,21 @@ public ReturnDTO borrowEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); // 通过id修改处理结果 - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("借用失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override public ReturnDTO returnEquipmentApply(IdDTO idDto) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode()); + updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN); if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("归还失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -309,10 +308,11 @@ if(equipmentApplyMapper.update(null, updateWrapper)>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("处理失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) { String formId = request.getFormId(); // 发起流程 @@ -335,6 +335,7 @@ } @Override + @Transactional public ReturnDTO failUpdate(EquipmentApply equipmentApply) { // 修改申请基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); @@ -358,8 +359,8 @@ //更新状态为审批中 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); } - return ReturnUtil.failed("修改失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java index 52f97d8..7c4fdbc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java @@ -8,7 +8,9 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.CheckInfoRequest; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper; import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper; import com.casic.missiles.model.equipment.EquipmentCheckInfo; @@ -19,6 +21,7 @@ import com.casic.missiles.utils.NumberGeneratorUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -58,7 +61,7 @@ if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -73,6 +76,7 @@ } @Override + @Transactional public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) { long maxNo = equipmentCheckInfoMapper.selectMaxNo(); String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo); @@ -85,11 +89,10 @@ boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList()); if(saveBatchFlg){ return ReturnUtil.success(); - }else{ - return ReturnUtil.failed("附件添加失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index ebd8ff6..20d6666 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -35,6 +35,7 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -152,10 +153,6 @@ } DictCodeUtils.convertDictCodeToName(item); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } @@ -177,7 +174,7 @@ } // 通过对应设备id查询设备详细信息 QueryWrapper fixedAssetsWrapper = new QueryWrapper<>(); - if(CollectionUtils.isEmpty(equipmentIds)){ + if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){ fixedAssetsWrapper.in("id", equipmentIds); List meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper); result.setFixedAssetsList(meterFixedAssets); @@ -191,6 +188,7 @@ } @Override + @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); @@ -217,21 +215,21 @@ } if(fileListResult&&equipmentListResult){ return ReturnUtil.success(meterStandardApply.getId()); - }else { - return ReturnUtil.failed("新增失败"); } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - return ReturnUtil.failed("操作失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ return ReturnUtil.success(); } - return ReturnUtil.failed("编辑失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override @@ -268,6 +266,7 @@ } @Override + @Transactional public ReturnDTO approvalDelete(ApprovalDeleteRequest request) { int flag = 0; // 审批操作-删除 @@ -285,10 +284,11 @@ if(flag>0){ return ReturnUtil.success(); } - return ReturnUtil.failed("删除失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @Override + @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); @@ -303,7 +303,7 @@ runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); return ReturnUtil.success(); } - return ReturnUtil.failed("编辑失败"); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } private String getApplyNoPrefix(String applyType){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index b1b937c..c9bbbff 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -105,10 +105,6 @@ } DictCodeUtils.convertDictCodeToName(item); } - if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){ - List collect = resultPage.getRecords().stream().sorted(Comparator.comparing(StateManageResponse::getCreateTime).reversed()).collect(Collectors.toList()); - resultPage.setRecords(collect); - } return resultPage; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java index d3f8c1e..85e7c50 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java @@ -174,7 +174,7 @@ } @Override - public ReturnDTO myselfEquipment() { + public ReturnDTO myselfEquipment() { EquipmentWorkbenchResponse response = new EquipmentWorkbenchResponse(); AuthUser user = ShiroKit.getUser(); Assert.isFalse(Objects.isNull(user), () -> { @@ -183,8 +183,8 @@ // 待检定数量 List businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL)); response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys,user.getId().toString())); - equipmentWorkbenchMapper.queryOvertimeNum(businessKeys,user.getId().toString()); - return null; + response.setOvertimeNum(equipmentWorkbenchMapper.queryOvertimeNum(businessKeys,user.getId().toString())); + return ReturnUtil.success(response); } public List getResultList(List resList) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index 17f4fe9..b012add 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -854,6 +854,16 @@ protected static EndEvent createEndEvent() { EndEvent endEvent = new EndEvent(); endEvent.setId(id("end")); + // 事件结束监听器 + ArrayList listeners = new ArrayList<>(); + FlowableListener listener = new FlowableListener(); + // 结束节点开始时 + listener.setEvent((ExecutionListener.EVENTNAME_START)); + // 监听器类型 + listener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_CLASS); + listener.setImplementation("com.casic.missiles.controller.flowable.ProcessUpdateStateListener"); + listeners.add(listener); + endEvent.setExecutionListeners(listeners); return endEvent; }