diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index b062ecd..49469d5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -70,11 +70,11 @@ */ @ApiOperation("证书审批-同意") @PostMapping("/agree") - public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.agreeAginPrint(request); + return certificatePrintService.agreeAginPrint(request); } /** @@ -82,11 +82,11 @@ */ @ApiOperation("证书审批-拒绝") @PostMapping("/refuse") - public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.refuseAgainPrint(request); + return certificatePrintService.refuseAgainPrint(request); } // /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index b062ecd..49469d5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -70,11 +70,11 @@ */ @ApiOperation("证书审批-同意") @PostMapping("/agree") - public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.agreeAginPrint(request); + return certificatePrintService.agreeAginPrint(request); } /** @@ -82,11 +82,11 @@ */ @ApiOperation("证书审批-拒绝") @PostMapping("/refuse") - public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.refuseAgainPrint(request); + return certificatePrintService.refuseAgainPrint(request); } // /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index f21769e..276a13f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -66,11 +66,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/satus/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); + return bizDispatchService.statusChange(deviceReceiveDTO); } /** @@ -78,11 +78,11 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO)); + return bizDispatchService.forcedTerminate(deviceReceiveDTO); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index b062ecd..49469d5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -70,11 +70,11 @@ */ @ApiOperation("证书审批-同意") @PostMapping("/agree") - public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.agreeAginPrint(request); + return certificatePrintService.agreeAginPrint(request); } /** @@ -82,11 +82,11 @@ */ @ApiOperation("证书审批-拒绝") @PostMapping("/refuse") - public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.refuseAgainPrint(request); + return certificatePrintService.refuseAgainPrint(request); } // /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index f21769e..276a13f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -66,11 +66,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/satus/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); + return bizDispatchService.statusChange(deviceReceiveDTO); } /** @@ -78,11 +78,11 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO)); + return bizDispatchService.forcedTerminate(deviceReceiveDTO); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index a846ff2..e2d588a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -90,7 +90,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); + return bizExchangeService.deleteExchange(idDTO.getId()); } @ApiOperation("设备交接单导出") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index b062ecd..49469d5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -70,11 +70,11 @@ */ @ApiOperation("证书审批-同意") @PostMapping("/agree") - public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.agreeAginPrint(request); + return certificatePrintService.agreeAginPrint(request); } /** @@ -82,11 +82,11 @@ */ @ApiOperation("证书审批-拒绝") @PostMapping("/refuse") - public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.refuseAgainPrint(request); + return certificatePrintService.refuseAgainPrint(request); } // /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index f21769e..276a13f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -66,11 +66,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/satus/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); + return bizDispatchService.statusChange(deviceReceiveDTO); } /** @@ -78,11 +78,11 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO)); + return bizDispatchService.forcedTerminate(deviceReceiveDTO); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index a846ff2..e2d588a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -90,7 +90,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); + return bizExchangeService.deleteExchange(idDTO.getId()); } @ApiOperation("设备交接单导出") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 7b09c44..5dcca11 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -108,7 +108,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + return businessOrderService.updateStatusById(idDTO.getId(),"3"); } //*******************************************************************************************************************// @@ -118,7 +118,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + return businessOrderService.updateStatusById(idDTO.getId(),"2"); } //*******************************************************************************************************************// @@ -128,7 +128,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + return businessOrderService.updateStatusById(idDTO.getId(),"3"); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index b062ecd..49469d5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -70,11 +70,11 @@ */ @ApiOperation("证书审批-同意") @PostMapping("/agree") - public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.agreeAginPrint(request); + return certificatePrintService.agreeAginPrint(request); } /** @@ -82,11 +82,11 @@ */ @ApiOperation("证书审批-拒绝") @PostMapping("/refuse") - public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.refuseAgainPrint(request); + return certificatePrintService.refuseAgainPrint(request); } // /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index f21769e..276a13f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -66,11 +66,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/satus/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); + return bizDispatchService.statusChange(deviceReceiveDTO); } /** @@ -78,11 +78,11 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO)); + return bizDispatchService.forcedTerminate(deviceReceiveDTO); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index a846ff2..e2d588a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -90,7 +90,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); + return bizExchangeService.deleteExchange(idDTO.getId()); } @ApiOperation("设备交接单导出") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 7b09c44..5dcca11 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -108,7 +108,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + return businessOrderService.updateStatusById(idDTO.getId(),"3"); } //*******************************************************************************************************************// @@ -118,7 +118,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + return businessOrderService.updateStatusById(idDTO.getId(),"2"); } //*******************************************************************************************************************// @@ -128,7 +128,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + return businessOrderService.updateStatusById(idDTO.getId(),"3"); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 2c0697d..ce06426 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -60,7 +60,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + return customerAdviceService.updateAdvice(customerAdviceInfo); } @ApiOperation("客户投诉新增") @@ -69,7 +69,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + return customerAdviceService.addAdvice(customerAdviceInfo); } @ApiOperation("客户投诉删除") @@ -78,7 +78,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + return customerAdviceService.deleteAdvice(idDTO.getId()); } //*******************************************************************************************************************// diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index b062ecd..49469d5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -70,11 +70,11 @@ */ @ApiOperation("证书审批-同意") @PostMapping("/agree") - public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.agreeAginPrint(request); + return certificatePrintService.agreeAginPrint(request); } /** @@ -82,11 +82,11 @@ */ @ApiOperation("证书审批-拒绝") @PostMapping("/refuse") - public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.refuseAgainPrint(request); + return certificatePrintService.refuseAgainPrint(request); } // /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index f21769e..276a13f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -66,11 +66,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/satus/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); + return bizDispatchService.statusChange(deviceReceiveDTO); } /** @@ -78,11 +78,11 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO)); + return bizDispatchService.forcedTerminate(deviceReceiveDTO); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index a846ff2..e2d588a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -90,7 +90,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); + return bizExchangeService.deleteExchange(idDTO.getId()); } @ApiOperation("设备交接单导出") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 7b09c44..5dcca11 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -108,7 +108,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + return businessOrderService.updateStatusById(idDTO.getId(),"3"); } //*******************************************************************************************************************// @@ -118,7 +118,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + return businessOrderService.updateStatusById(idDTO.getId(),"2"); } //*******************************************************************************************************************// @@ -128,7 +128,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + return businessOrderService.updateStatusById(idDTO.getId(),"3"); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 2c0697d..ce06426 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -60,7 +60,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + return customerAdviceService.updateAdvice(customerAdviceInfo); } @ApiOperation("客户投诉新增") @@ -69,7 +69,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + return customerAdviceService.addAdvice(customerAdviceInfo); } @ApiOperation("客户投诉删除") @@ -78,7 +78,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + return customerAdviceService.deleteAdvice(idDTO.getId()); } //*******************************************************************************************************************// diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 36f3c61..7591c07 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -63,7 +63,7 @@ if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return ReturnUtil.success(customerService.addCustomer(customerInfo)); + return customerService.addCustomer(customerInfo); } @ApiOperation("客户更新") @@ -72,7 +72,7 @@ if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + return customerService.updateCustomer(customerInfo); } @ApiOperation("客户详情") @@ -118,7 +118,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + return customerService.deleteCustomer(idDTO.getId()); } @ApiOperation("根据客户id查询检定证书-分页") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java index b062ecd..49469d5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java @@ -70,11 +70,11 @@ */ @ApiOperation("证书审批-同意") @PostMapping("/agree") - public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { + public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.agreeAginPrint(request); + return certificatePrintService.agreeAginPrint(request); } /** @@ -82,11 +82,11 @@ */ @ApiOperation("证书审批-拒绝") @PostMapping("/refuse") - public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { + public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - certificatePrintService.refuseAgainPrint(request); + return certificatePrintService.refuseAgainPrint(request); } // /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index f21769e..276a13f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -66,11 +66,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/satus/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO)); + return bizDispatchService.statusChange(deviceReceiveDTO); } /** @@ -78,11 +78,11 @@ */ @ApiOperation("设备终止") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { + public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO)); + return bizDispatchService.forcedTerminate(deviceReceiveDTO); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index a846ff2..e2d588a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -90,7 +90,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId())); + return bizExchangeService.deleteExchange(idDTO.getId()); } @ApiOperation("设备交接单导出") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java index 7b09c44..5dcca11 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java @@ -108,7 +108,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + return businessOrderService.updateStatusById(idDTO.getId(),"3"); } //*******************************************************************************************************************// @@ -118,7 +118,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2")); + return businessOrderService.updateStatusById(idDTO.getId(),"2"); } //*******************************************************************************************************************// @@ -128,7 +128,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3")); + return businessOrderService.updateStatusById(idDTO.getId(),"3"); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java index 2c0697d..ce06426 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java @@ -60,7 +60,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo)); + return customerAdviceService.updateAdvice(customerAdviceInfo); } @ApiOperation("客户投诉新增") @@ -69,7 +69,7 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo)); + return customerAdviceService.addAdvice(customerAdviceInfo); } @ApiOperation("客户投诉删除") @@ -78,7 +78,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId())); + return customerAdviceService.deleteAdvice(idDTO.getId()); } //*******************************************************************************************************************// diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java index 36f3c61..7591c07 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java @@ -63,7 +63,7 @@ if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return ReturnUtil.success(customerService.addCustomer(customerInfo)); + return customerService.addCustomer(customerInfo); } @ApiOperation("客户更新") @@ -72,7 +72,7 @@ if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return ReturnUtil.success(customerService.updateCustomer(customerInfo)); + return customerService.updateCustomer(customerInfo); } @ApiOperation("客户详情") @@ -118,7 +118,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId())); + return customerService.deleteCustomer(idDTO.getId()); } @ApiOperation("根据客户id查询检定证书-分页") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java index 609d1d0..9909809 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java @@ -54,7 +54,7 @@ if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo)); + return customerSampleService.addSample(customerSampleInfo); } @ApiOperation("样品编辑") @@ -66,7 +66,7 @@ if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo)); + return customerSampleService.updateSample(customerSampleInfo); } @ApiOperation("样品详情") @@ -84,7 +84,7 @@ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId())); + return customerSampleService.deleteSample(idDTO.getId()); } @ApiOperation("样品导出")